Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Tue, 7 Jan 2014 13:50:35 +0000 (13:50 +0000)
committerIan Campbell <ian.campbell@citrix.com>
Tue, 7 Jan 2014 13:50:35 +0000 (13:50 +0000)
commitb764615c391fdc2648d460245c748a3a319a296e
tree9ed5bacdba38de3d031d11596aacf3fd0e4cfd0e
parent57a45785584e651b807eed08f3a6950d4ade0156
parentf4fed540e78ac8a2bd3b1dee53a5206dde25f613
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging